Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix #564, consolidate delete finalization code #567

Merged

Conversation

jphickey
Copy link
Contributor

Describe the contribution

Remove repetitive clearing of the global ID and unlocking global table and replace with common implementation in the
idmap source file. In addition to removing repeated logic, this makes deletion more like an inverse of creation, and provides
a common/single point where additional deletion-related logic can be added.

Fixes #564

Testing performed
Build and sanity test CFE
Confirm all unit tests

Expected behavior changes
No impact to external API or behavior. Internal code consolidation only.

System(s) tested on
Ubuntu 20.04

Additional context
See also #540 and #532

Contributor Info - All information REQUIRED for consideration of pull request
Joseph Hickey, Vantage Systems, Inc.

@jphickey jphickey added the CCB:Ready Pull request is ready for discussion at the Configuration Control Board (CCB) label Aug 18, 2020
@jphickey jphickey requested a review from a user August 18, 2020 20:40
Remove repetitive clearing of the global ID and unlocking
global table and replace with common implementation in the
idmap code.  In addition to removing repeated logic, this
makes deletion more like an inverse of creation, and provides
a common/single point where additiona deletion-related
logic can be added.
@jphickey
Copy link
Contributor Author

Note- commit just 2cc7dc5 corrects an unused variable issue reported by cppcheck.

@jphickey
Copy link
Contributor Author

@klystron78 - FYI this is largely the same subject as your previous review of #541. However note that the return_code is indeed still checked, the objective here is to put the cleanup code inside a common function (in this case OS_ObjectIdFinalizeDelete) rather than copying the same check everywhere.

@astrogeco
Copy link
Contributor

CCB 2020-08-19 APPROVED

@yammajamma yammajamma added CCB:Approved Indicates code review and approval by community CCB IC-20200819 labels Aug 20, 2020
@yammajamma yammajamma changed the base branch from main to integration-candidate August 20, 2020 00:44
@yammajamma yammajamma merged commit 6d77666 into nasa:integration-candidate Aug 20, 2020
@yammajamma yammajamma removed the CCB:Ready Pull request is ready for discussion at the Configuration Control Board (CCB) label Aug 20, 2020
@skliper skliper added this to the 6.0.0 milestone Aug 21, 2020
@jphickey jphickey deleted the fix-564-consolidate-delete branch December 3, 2020 17:33
jphickey pushed a commit to jphickey/osal that referenced this pull request Aug 10, 2022
jphickey pushed a commit to jphickey/osal that referenced this pull request Aug 10, 2022
Fix nasa#567, Document CFE_ES_RunLoop increment task counter behavior
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
CCB:Approved Indicates code review and approval by community CCB
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Consolidate cleanup code into a separate "FinalizeDelete" routine
4 participants